rename member fields from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems

2001-01-20  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
	from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to
	me, matches Pango

diff --git a/ChangeLog b/ChangeLog
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25b79c7736ffb0ef1f77a18eab3bb86ddf8e2d28..57cd0559c8351da6a3beee05ad0fbf5a6c90b0a9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-01-20  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktexttag.h (enum GtkWrapMode): rename member fields
+       from GTK_WRAPMODE_WORD to GTK_WRAP_WORD, etc., seems nicer to 
+       me, matches Pango
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * demos/testanimation.c: fix to reflect gdk-pixbuf changes

diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 4ea37c3824b892294e7c1407ece09ed5784c09b1..b5d849c7102312dc56ca6494755a3e7d2e54e178 100644 (file)
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -110,13 +110,13 @@ create_tags (GtkTextBuffer *buffer)
   g_object_set (G_OBJECT (tag), "editable", FALSE, NULL);
   
   tag = gtk_text_buffer_create_tag (buffer, "word_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_WORD, NULL);
+  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_WORD, NULL);
 
   tag = gtk_text_buffer_create_tag (buffer, "char_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_CHAR, NULL);
+  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_CHAR, NULL);
 
   tag = gtk_text_buffer_create_tag (buffer, "no_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_NONE, NULL);
+  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_NONE, NULL);
   
   tag = gtk_text_buffer_create_tag (buffer, "center");
   g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_CENTER, NULL);

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 01c8177a91b5f67d33918f34f98721c8cf8cc9b9..3afabc5895fde688b40ad45c865817d282a64d3b 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1121,19 +1121,19 @@ set_para_values (GtkTextLayout      *layout,
 
   switch (style->wrap_mode)
     {
-    case GTK_WRAPMODE_CHAR:
+    case GTK_WRAP_CHAR:
       layout_width = layout->screen_width - display->left_margin - display->right_margin;
       pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
       pango_layout_set_wrap (display->layout, PANGO_WRAP_CHAR);
       break;
 
-    case GTK_WRAPMODE_WORD:
+    case GTK_WRAP_WORD:
       layout_width = layout->screen_width - display->left_margin - display->right_margin;
       pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
       pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD);
       break;
 
-    case GTK_WRAPMODE_NONE:
+    case GTK_WRAP_NONE:
       break;
     }
   

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 1e3d51bfbbf07260d4ddb3b64f4efc5a90f6302d..1cd630bdbbc5f0e2b6f7a952bb9d451f01c30c55 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -475,7 +475,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      _("Wrap mode"),
                                                      _("Whether to wrap lines never, at word boundaries, or at character boundaries"),
                                                       GTK_TYPE_WRAP_MODE,
-                                                      GTK_WRAPMODE_NONE,
+                                                      GTK_WRAP_NONE,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
   
 

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index f4abd8e174ba9dbcc8998023cd35506724146d1a..1511b5452ab5d6a232cc37953d1fb2c3a60629e6 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -14,9 +14,9 @@ typedef struct _GtkTextTagTable GtkTextTagTable;
 
 typedef enum
 {
-  GTK_WRAPMODE_NONE,
-  GTK_WRAPMODE_CHAR,
-  GTK_WRAPMODE_WORD
+  GTK_WRAP_NONE,
+  GTK_WRAP_CHAR,
+  GTK_WRAP_WORD
 } GtkWrapMode;
 
 typedef struct _GtkTextAttributes GtkTextAttributes;

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 659656b7be57fcdac4c3c81e33f66e84467c42fa..e18340d65f493f91294757da811ba6818712403e 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -752,7 +752,7 @@ gtk_text_view_init (GtkTextView *text_view)
   GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
 
   /* Set up default style */
-  text_view->wrap_mode = GTK_WRAPMODE_NONE;
+  text_view->wrap_mode = GTK_WRAP_NONE;
   text_view->pixels_above_lines = 0;
   text_view->pixels_below_lines = 0;
   text_view->pixels_inside_wrap = 0;
@@ -1588,8 +1588,8 @@ gtk_text_view_set_wrap_mode (GtkTextView *text_view,
 GtkWrapMode
 gtk_text_view_get_wrap_mode (GtkTextView *text_view)
 {
-  g_return_val_if_fail (text_view != NULL, GTK_WRAPMODE_NONE);
-  g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAPMODE_NONE);
+  g_return_val_if_fail (text_view != NULL, GTK_WRAP_NONE);
+  g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAP_NONE);
 
   return text_view->wrap_mode;
 }

diff --git a/gtk/testtext.c b/gtk/testtext.c
index 9a66df2cb9722150cb7f9a63fb361db69090a0cf..85c662ef0e317c810b124bbf09aee509acc336ae 100644 (file)
--- a/gtk/testtext.c
+++ b/gtk/testtext.c
@@ -506,11 +506,11 @@ fill_example_buffer (GtkTextBuffer *buffer)
   tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
       
   g_object_set (G_OBJECT (tag),
-                "wrap_mode", GTK_WRAPMODE_WORD,
+                "wrap_mode", GTK_WRAP_WORD,
                 "direction", GTK_TEXT_DIR_RTL,
                 "indent", 30,
                 "left_margin", 20,
-                "right_margin", 20,
+                  "right_margin", 20,
                 NULL);
 
 
@@ -1176,13 +1176,13 @@ view_init_menus (View *view)
 
   switch (wrap_mode)
     {
-    case GTK_WRAPMODE_NONE:
+    case GTK_WRAP_NONE:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
       break;
-    case GTK_WRAPMODE_WORD:
+    case GTK_WRAP_WORD:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
       break;
-    case GTK_WRAPMODE_CHAR:
+    case GTK_WRAP_CHAR:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars");
       break;
     default:
@@ -1209,9 +1209,9 @@ static GtkItemFactoryEntry menu_items[] =
   { "/Edit/Find...", NULL, do_search, 0, NULL },
 
   { "/_Settings",        NULL,         0,                0, "<Branch>" },
-  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAPMODE_NONE, "<RadioItem>" },
-  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAPMODE_WORD, "/Settings/Wrap Off" },
-  { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAPMODE_CHAR, "/Settings/Wrap Off" },
+  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAP_NONE, "<RadioItem>" },
+  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAP_WORD, "/Settings/Wrap Off" },
+  { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAP_CHAR, "/Settings/Wrap Off" },
   { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
   { "/Settings/Editable", NULL,      do_editable_changed,  TRUE, "<RadioItem>" },
   { "/Settings/Not editable",    NULL,      do_editable_changed,  FALSE, "/Settings/Editable" },
@@ -2146,7 +2146,7 @@ create_view (Buffer *buffer)
 
   view->text_view = gtk_text_view_new_with_buffer (buffer->buffer);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view),
-                               GTK_WRAPMODE_WORD);
+                               GTK_WRAP_WORD);
   
   /* Draw tab stops in the top and bottom windows. */
   

diff --git a/tests/testtext.c b/tests/testtext.c
index 9a66df2cb9722150cb7f9a63fb361db69090a0cf..85c662ef0e317c810b124bbf09aee509acc336ae 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -506,11 +506,11 @@ fill_example_buffer (GtkTextBuffer *buffer)
   tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
       
   g_object_set (G_OBJECT (tag),
-                "wrap_mode", GTK_WRAPMODE_WORD,
+                "wrap_mode", GTK_WRAP_WORD,
                 "direction", GTK_TEXT_DIR_RTL,
                 "indent", 30,
                 "left_margin", 20,
-                "right_margin", 20,
+                  "right_margin", 20,
                 NULL);
 
 
@@ -1176,13 +1176,13 @@ view_init_menus (View *view)
 
   switch (wrap_mode)
     {
-    case GTK_WRAPMODE_NONE:
+    case GTK_WRAP_NONE:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
       break;
-    case GTK_WRAPMODE_WORD:
+    case GTK_WRAP_WORD:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
       break;
-    case GTK_WRAPMODE_CHAR:
+    case GTK_WRAP_CHAR:
       menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars");
       break;
     default:
@@ -1209,9 +1209,9 @@ static GtkItemFactoryEntry menu_items[] =
   { "/Edit/Find...", NULL, do_search, 0, NULL },
 
   { "/_Settings",        NULL,         0,                0, "<Branch>" },
-  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAPMODE_NONE, "<RadioItem>" },
-  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAPMODE_WORD, "/Settings/Wrap Off" },
-  { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAPMODE_CHAR, "/Settings/Wrap Off" },
+  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAP_NONE, "<RadioItem>" },
+  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAP_WORD, "/Settings/Wrap Off" },
+  { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAP_CHAR, "/Settings/Wrap Off" },
   { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
   { "/Settings/Editable", NULL,      do_editable_changed,  TRUE, "<RadioItem>" },
   { "/Settings/Not editable",    NULL,      do_editable_changed,  FALSE, "/Settings/Editable" },
@@ -2146,7 +2146,7 @@ create_view (Buffer *buffer)
 
   view->text_view = gtk_text_view_new_with_buffer (buffer->buffer);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view),
-                               GTK_WRAPMODE_WORD);
+                               GTK_WRAP_WORD);
   
   /* Draw tab stops in the top and bottom windows. */